* src/xdisp.c (compute_display_string_pos): Fix bzr merge glitch.
authorPaul Eggert <eggert@cs.ucla.edu>
Sun, 14 Aug 2011 06:04:44 +0000 (23:04 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Sun, 14 Aug 2011 06:04:44 +0000 (23:04 -0700)
commit72f838d47543177aaa33e5ac482c8005913cc633
treedcc32f3329b3e5a4a9ea3591947f3f99794731a3
parent0fd2ace09f1c586bbd436497298f2721b8375b42
* src/xdisp.c (compute_display_string_pos): Fix bzr merge glitch.
src/xdisp.c